rp-pppoe: delete the file /etc/ppp/options

/etc/ppp/options is the configuration file for the ppp package.
rp-pppoe depends on the ppp package.

Signed-off-by: Findlay Feng <[email protected]>

diff --git a/net/rp-pppoe/Makefile b/net/rp-pppoe/Makefile
index 18093ac3f7db957cae73ffecab7ee7a6b9dc39c7..dceac898baa8fd078ca37d73e6102ad4fc5575f1 100644 (file)
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rp-pppoe
 PKG_VERSION:=4.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://downloads.uls.co.za/rp-pppoe/
@@ -79,7 +79,6 @@ endef
 
 define Package/rp-pppoe-server/conffiles
 /etc/ppp/pppoe-server-options
-/etc/ppp/options
 /etc/ppp/pap-secrets
 /etc/ppp/chap-secrets
 /etc/default/pppoe-server
@@ -132,7 +131,7 @@ define Package/rp-pppoe-server/install
        $(INSTALL_DIR) $(1)/etc/init.d $(1)/etc/uci-defaults
        $(INSTALL_BIN) ./files/pppoe-server.init $(1)/etc/init.d/pppoe-server
        $(INSTALL_DIR) $(1)/etc/ppp
-       $(INSTALL_CONF) ./files/ppp/{options,pap-secrets,pppoe-server-options} $(1)/etc/ppp/
+       $(INSTALL_CONF) ./files/ppp/{pap-secrets,pppoe-server-options} $(1)/etc/ppp/
        $(INSTALL_DIR) $(1)/etc/ppp/plugins
        $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/pppoe-server $(1)/usr/sbin/

diff --git a/net/rp-pppoe/files/ppp/options b/net/rp-pppoe/files/ppp/options
deleted file mode 100644 (file)
index 6b93f7b..0000000
--- a/net/rp-pppoe/files/ppp/options
+++ /dev/null
@@ -1,10 +0,0 @@
-#debug
-logfile /dev/null
-noipdefault
-noaccomp
-nopcomp
-nocrtscts
-lock
-maxfail 0
-lcp-echo-failure 5
-lcp-echo-interval 1